Autogenerated HTML docs for v1.5.5-rc1-6-g5cc8f
diff --git a/RelNotes-1.5.5.txt b/RelNotes-1.5.5.txt index 14beed4..18ff82b 100644 --- a/RelNotes-1.5.5.txt +++ b/RelNotes-1.5.5.txt
@@ -79,8 +79,9 @@ * "git branch" (and "git checkout -b") to branch from a local branch can optionally set "branch.<name>.merge" to mark the new branch to build on the other local branch, when "branch.autosetupmerge" is set to - "always". By default, this does not happen when branching from a local - branch. + "always", or when passing the command line option "--track" (this option + was ignored when branching from local branches). By default, this does + not happen when branching from a local branch. * "git checkout" to switch to a branch that has "branch.<name>.merge" set (i.e. marked to build on another branch) reports how much the branch
diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt index a98377c..514de13 100644 --- a/cmds-mainporcelain.txt +++ b/cmds-mainporcelain.txt
@@ -17,7 +17,7 @@ Move objects and refs by archive. linkgit:git-checkout[1]:: - Checkout and switch to a branch. + Checkout a branch or paths to the working tree. linkgit:git-cherry-pick[1]:: Apply the change introduced by an existing commit.
diff --git a/git-checkout.html b/git-checkout.html index e5a74dd..1b5fbff 100644 --- a/git-checkout.html +++ b/git-checkout.html
@@ -266,7 +266,7 @@ <h2>NAME</h2> <div class="sectionbody"> <p>git-checkout - - Checkout and switch to a branch + Checkout a branch or paths to the working tree </p> </div> </div> @@ -539,7 +539,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 28-Feb-2008 00:25:37 UTC +Last updated 25-Mar-2008 09:10:21 UTC </div> </div> </body>
diff --git a/git-checkout.txt b/git-checkout.txt index 4014e72..e11cddb 100644 --- a/git-checkout.txt +++ b/git-checkout.txt
@@ -3,7 +3,7 @@ NAME ---- -git-checkout - Checkout and switch to a branch +git-checkout - Checkout a branch or paths to the working tree SYNOPSIS --------
diff --git a/git-tag.html b/git-tag.html index 5734774..4ad7810 100644 --- a/git-tag.html +++ b/git-tag.html
@@ -287,6 +287,8 @@ creates a <em>tag</em> object, and requires the tag message. Unless <tt>-m <msg></tt> or <tt>-F <file></tt> is given, an editor is started for the user to type in the tag message.</p> +<p>If <tt>-m <msg></tt> or <tt>-F <file></tt> is given and <tt>-a</tt>, <tt>-s</tt>, and <tt>-u <key-id></tt> +are absent, <tt>-a</tt> is implied.</p> <p>Otherwise just the SHA1 object name of the commit object is written (i.e. a lightweight tag).</p> <p>A GnuPG signed tag object will be created when <tt>-s</tt> or <tt>-u @@ -373,6 +375,8 @@ Use the given tag message (instead of prompting). If multiple <tt>-m</tt> options are given, there values are concatenated as separate paragraphs. + Implies <tt>-a</tt> if none of <tt>-a</tt>, <tt>-s</tt>, or <tt>-u <key-id></tt> + is given. </p> </dd> <dt> @@ -382,6 +386,8 @@ <p> Take the tag message from the given file. Use <em>-</em> to read the message from the standard input. + Implies <tt>-a</tt> if none of <tt>-a</tt>, <tt>-s</tt>, or <tt>-u <key-id></tt> + is given. </p> </dd> </dl> @@ -546,7 +552,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:50:53 UTC +Last updated 25-Mar-2008 09:10:21 UTC </div> </div> </body>
diff --git a/git-tag.txt b/git-tag.txt index b62a3d1..c22fb71 100644 --- a/git-tag.txt +++ b/git-tag.txt
@@ -26,6 +26,9 @@ `-m <msg>` or `-F <file>` is given, an editor is started for the user to type in the tag message. +If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <key-id>` +are absent, `-a` is implied. + Otherwise just the SHA1 object name of the commit object is written (i.e. a lightweight tag). @@ -68,10 +71,14 @@ Use the given tag message (instead of prompting). If multiple `-m` options are given, there values are concatenated as separate paragraphs. + Implies `-a` if none of `-a`, `-s`, or `-u <key-id>` + is given. -F <file>:: Take the tag message from the given file. Use '-' to read the message from the standard input. + Implies `-a` if none of `-a`, `-s`, or `-u <key-id>` + is given. CONFIGURATION -------------
diff --git a/git.html b/git.html index d450225..c4c9b49 100644 --- a/git.html +++ b/git.html
@@ -457,7 +457,7 @@ </dt> <dd> <p> - Checkout and switch to a branch. + Checkout a branch or paths to the working tree. </p> </dd> <dt> @@ -1946,7 +1946,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 09-Mar-2008 10:38:34 UTC +Last updated 25-Mar-2008 09:10:22 UTC </div> </div> </body>
diff --git a/glossary.html b/glossary.html index 9bece8d..e403aed 100644 --- a/glossary.html +++ b/glossary.html
@@ -347,9 +347,12 @@ </dt> <dd> <p> - The action of updating the <a href="#def_working_tree">working tree</a> to a - <a href="#def_revision">revision</a> which was stored in the - <a href="#def_object_database">object database</a>. + The action of updating all or part of the + <a href="#def_working_tree">working tree</a> with a <a href="#def_tree_object">tree object</a> + or <a href="#def_blob_object">blob</a> from the + <a href="#def_object_database">object database</a>, and updating the + <a href="#def_index">index</a> and <a href="#def_HEAD">HEAD</a> if the whole working tree has + been pointed at a new <a href="#def_branch">branch</a>. </p> </dd> <dt> @@ -1079,7 +1082,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 07-Jan-2008 07:51:14 UTC +Last updated 25-Mar-2008 09:10:23 UTC </div> </div> </body>
diff --git a/glossary.txt b/glossary.txt index ab4caf4..51b6353 100644 --- a/glossary.txt +++ b/glossary.txt
@@ -45,9 +45,12 @@ "changesets" with git. [[def_checkout]]checkout:: - The action of updating the <<def_working_tree,working tree>> to a - <<def_revision,revision>> which was stored in the - <<def_object_database,object database>>. + The action of updating all or part of the + <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> + or <<def_blob_object,blob>> from the + <<def_object_database,object database>>, and updating the + <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has + been pointed at a new <<def_branch,branch>>. [[def_cherry-picking]]cherry-picking:: In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of
diff --git a/user-manual.html b/user-manual.html index 14c8725..58d20b9 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -1798,7 +1798,7 @@ <code class="literal">prepare_revision_walk()</code> for initialization, and then you can get the commits one by one with the function <code class="literal">get_revision()</code>.</p><p>If you are interested in more details of the revision walking process, just have a look at the first implementation of <code class="literal">cmd_log()</code>; call -<code class="literal">git-show v1.3.0<sub>155^2</sub>4</code> and scroll down to that function (note that you +<code class="literal">git-show v1.3.0~155^2~4</code> and scroll down to that function (note that you no longer need to call <code class="literal">setup_pager()</code> directly).</p><p>Nowadays, <code class="literal">git log</code> is a builtin, which means that it is _contained_ in the command <code class="literal">git</code>. The source side of a builtin is</p><div class="itemizedlist"><ul type="disc"><li> a function called <code class="literal">cmd_<bla></code>, typically defined in <code class="literal">builtin-<bla>.c</code>, @@ -1907,9 +1907,12 @@ </dd><dt><span class="term"> <a name="def_checkout"></a>checkout </span></dt><dd> - The action of updating the <a href="#def_working_tree">working tree</a> to a - <a href="#def_revision">revision</a> which was stored in the - <a href="#def_object_database">object database</a>. + The action of updating all or part of the + <a href="#def_working_tree">working tree</a> with a <a href="#def_tree_object">tree object</a> + or <a href="#def_blob_object">blob</a> from the + <a href="#def_object_database">object database</a>, and updating the + <a href="#def_index">index</a> and <a href="#def_HEAD">HEAD</a> if the whole working tree has + been pointed at a new <a href="#def_branch">branch</a>. </dd><dt><span class="term"> <a name="def_cherry-picking"></a>cherry-picking </span></dt><dd>
diff --git a/user-manual.txt b/user-manual.txt index 40b0de0..565aeb9 100644 --- a/user-manual.txt +++ b/user-manual.txt
@@ -4144,7 +4144,7 @@ If you are interested in more details of the revision walking process, just have a look at the first implementation of `cmd_log()`; call -`git-show v1.3.0~155^2~4` and scroll down to that function (note that you +`git-show v1.3.0{tilde}155^2{tilde}4` and scroll down to that function (note that you no longer need to call `setup_pager()` directly). Nowadays, `git log` is a builtin, which means that it is _contained_ in the 